Feature/clean thumbnails avatars by zerox80 · Pull Request #85 · opencloud-eu/android

zerox80 · 2026-01-19T13:21:26Z

Thumbnail Cache Refactoring and Avatar Fixes

Summary

This pull request refactors the thumbnail caching mechanism to improve performance and stability, and includes critical fixes for user avatar loading. The legacy ThumbnailsCacheManager has been replaced by an optimized ThumbnailsRequester implementation, and several thread safety issues have been resolved.

Technical Details

Thumbnail Caching

Refactoring: Completely removed ThumbnailsCacheManager and DiskLruImageCache in favor of a modern, streamlined approach within ThumbnailsRequester.
Thread Safety: Addressed race conditions in ThumbnailsRequester when initializing the shared disk and memory caches. Access to these caches is now properly synchronized.
Optimization: Adjusted thumbnail sizing logic to prevent memory waste and improve loading times.
Dead Code Removal: Cleaned up unused legacy code and resources related to the old caching system.

Avatar Loading

Graph API Integration: Updated the user avatar loading logic to utilize the Graph API endpoint, ensuring reliable retrieval of user profile images.
Cache Control: Fixed issues with avatar cache invalidation and loading control to ensure users always see the correct profile picture.
Bug Fixes: Resolved specific crashes and loading failures related to avatar requests in various parts of the UI (Drawer, Toolbar, Upload List).

Other Changes

Code Quality: Resolved extensive Detekt issues, including formatting and spacing violations.
Stability: Fixed potential crashes caused by incorrect context usage or missing null checks in the thumbnail generation flow.

Impact

These changes significantly reduce the maintenance burden by removing complex legacy caching code and provide a smoother user experience with faster and more reliable thumbnail and avatar loading.

Testing

Verified that file thumbnails load correctly in the file list and grid view.
Verified that user avatars appear correctly in the navigation drawer and toolbar.
Confirmed that removing the legacy cache classes does not introduce regressions in image loading.

guruz · 2026-02-10T12:20:53Z

opencloudApp/src/main/java/eu/opencloud/android/presentation/thumbnails/ThumbnailsRequester.kt


    private const val SPACE_SPECIAL_PREVIEW_URI = "%s?scalingup=0&a=1&x=%d&y=%d&c=%s&preview=1"
-    private const val FILE_PREVIEW_URI = "%s%s?x=%d&y=%d&c=%s&preview=1&id=%s"
+    private const val FILE_PREVIEW_URI = "%s/remote.php/webdav%s?x=%d&y=%d&c=%s&preview=1"


I don't think this looks good, OpenCloud is not PHP anymore.

guruz · 2026-02-10T12:22:13Z

Thumbnail Caching

I haven't really looked at the code yet. Where is stuff cached? From the names it seems it was Disk(Lru) before, what is it now?

guruz · 2026-02-24T15:53:09Z

FYI I'm looking / testing this PR now. @zerox80

zerox80 · 2026-02-25T10:20:24Z

Hi, ill take a look now, was busy sorry

zerox80 · 2026-02-25T11:26:07Z

re-test please @guruz

zerox80 · 2026-02-25T14:44:44Z

Thumbnail Caching

I haven't really looked at the code yet. Where is stuff cached? From the names it seems it was Disk(Lru) before, what is it now?

We completely moved away from the old manual DiskLruCache handling and now rely on Coil's built-in caching mechanism, which is much more efficient and modern.

It uses a two-tier caching strategy (both Memory and Disk cache), which is configured centrally in the ThumbnailsRequester.kt

Disk Cache: We use Coil's DiskCache.Builder() to store thumbnails in the app's cache directory (thumbnails_coil_cache). It is explicitly limited to 100MB to ensure it doesn't inflate the app storage endlessly. (Location: appContext.cacheDir.resolve("thumbnails_coil_cache"))

Memory Cache: We use Coil's MemoryCache.Builder() configured to use up to 25% of the available application memory (maxSizePercent(0.25)). This drastically improves scrolling performance in lists/grids because decoded images are kept directly in memory.

Both caches are shared as Singletons (sharedDiskCache and sharedMemoryCache) and passed to the ImageLoader instance, so the caching rules apply globally to all thumbnail requests handled by Coil

This commit acts as a squash of the thumbnail cache refactoring and avatar fixes. See PR description for full details.

- Update FILE_PREVIEW_URI to use direct native /webdav path. - Use Graph API explicitly for fetching Avatar image, dropping the /index.php/avatar hack & interceptor fallbacks.

…mber)

guruz · 2026-02-26T11:22:58Z

(Don't do any changes now on top as I'm working on your branch myself now)

I actually think your code is regressing the cache by not going to the cache first if we had a preview already in (disk) cache.
So it makes the behavior of the app worse by not showing images when being offline or unauthorized.

I'll check if there is a goo way to fix this..

guruz · 2026-02-26T11:32:26Z

Or maybe I take this back.
It seems this happened when the server sent 401 because token expired
When there was a network error (UnknownHost or whatever) it actually went succesfully to the cache

02-26 12:31:12.678 14205 14205 I RealImageLoader: 💾 Successful (DISK) - https://demo.opencloud.eu/webdav/OpenCloud-UI-Tab_Work_Web_2400px.jpg?x=1024&y=1024&c=&preview=1

Can ignore this for now then :)

guruz · 2026-02-26T13:14:47Z

Can ignore this for now then :)

Or can not ignore this. Because 401 is actually quite likely if access_token has low expiry time.

But maybe the actual fix is not related to here, but re-ordering how ConnectionValidator & friends behave or how token expiry is detected.

Just notes to myself..

zerox80 · 2026-02-26T14:01:35Z

Hey @guruz, just to share some thoughts on why the cache behaves differently between UnknownHostException and 401 Unauthorized:

The difference lies in how OkHttp/Coil handles HTTP responses versus network exceptions when checking the disk cache. When Coil tries to load an image, it might need to validate a stale cache entry.

If the device is offline, OkHttp throws an IOException (like UnknownHostException). Coil/OkHttp Cache catches this and correctly falls back to returning the stale disk cache entry.
However, if the token is expired, the server responds with an HTTP 401. To OkHttp/Coil, this is a successful network transaction (no IOException is thrown). Since the server explicitly rejected the request, OkHttp doesn't fall back to the stale cache; it just returns the 401 response to Coil, which then fails the image load.
Possible solutions to consider:

Refresh on 401: Add an OkHttp Authenticator (or Interceptor) to the client used by Coil. When it catches a 401, it can synchronously refresh the token via AccountManager and retry the image request.
Mask 401 as Offline: If token refresh fails or isn't possible right away, an OkHttp Interceptor could catch the 401 and explicitly throw an IOException("Unauthorized - Token Expired"). By throwing an exception instead of returning the 401 response, it would trick Coil into treating it exactly like an offline scenario, and it will serve the stale image from the disk cache.

zerox80 · 2026-02-26T16:21:29Z

Hey, so there was a bug that TUS Upload doesn't get an Etag? Somehow?

its fixed now, please test

guruz · 2026-02-26T17:28:01Z

@zerox80 Thanks for spotting/fixing! I'll try it out..

@TheOneRing CC
Seems the desktop client also has this flow where it can receive an ETag or not and then do PROPFIND. https://github.com/opencloud-eu/desktop/blob/c7c05eaadf5d9cb53c95f9c6872703a9d70ba3fb/src/libsync/propagateuploadtus.cpp#L260
Wondering why we don't always get one, is that storage specific?
old upstream discussion see here: owncloud/ocis#216 (comment)

TUS PATCH responses from openCloud do not include ETag headers. This caused large file uploads (>10MB) to have null ETags in the local database, breaking thumbnail preview URLs and caching. Changes: - TusUploadHelper: after TUS upload completes, perform a PROPFIND to fetch the file's ETag from the server - PatchTusUploadChunkRemoteOperation: extract ETag from PATCH response header (for future backend support) - UploadFileFromFileSystemWorker: persist ETag to database for both overwrite and non-overwrite uploads - ThumbnailsRequester: use .orEmpty() for null-safe ETag formatting

zerox80 · 2026-02-26T18:08:50Z

@zerox80 Thanks for spotting/fixing! I'll try it out..

@TheOneRing CC Seems the desktop client also has this flow where it can receive an ETag or not and then do PROPFIND. https://github.com/opencloud-eu/desktop/blob/c7c05eaadf5d9cb53c95f9c6872703a9d70ba3fb/src/libsync/propagateuploadtus.cpp#L260 Wondering why we don't always get one, is that storage specific? old upstream discussion see here: owncloud/ocis#216 (comment)

The Tusd library has a hook called PreFinishResponseCallback, with that REVA could calculate the etag after the last chunk and write it to the response header, but this hook is never used....

Is it atleast planned? Should we open Issue on Opencloud backend repo?

zerox80 force-pushed the feature/clean-thumbnails-avatars branch 2 times, most recently from 6f322b4 to 72d55fa Compare January 20, 2026 08:05

guruz reviewed Feb 10, 2026

View reviewed changes

zerox80 added 4 commits February 25, 2026 16:06

Feature: Thumbnail Cache Refactoring and Avatar Fixes

c3c688b

This commit acts as a squash of the thumbnail cache refactoring and avatar fixes. See PR description for full details.

Fix detekt issue: remove unused avatarDimension

0db03b3

Fix: Remove legacy PHP endpoints for thumbnails and avatars

5f41e5f

- Update FILE_PREVIEW_URI to use direct native /webdav path. - Use Graph API explicitly for fetching Avatar image, dropping the /index.php/avatar hack & interceptor fallbacks.

Fix: Remove unused isProbablyAnImage function (Detekt UnusedPrivateMe…

a5e37bc

…mber)

zerox80 force-pushed the feature/clean-thumbnails-avatars branch from a5268f3 to a5e37bc Compare February 25, 2026 15:06

zerox80 force-pushed the feature/clean-thumbnails-avatars branch from 4c430f5 to 68322d8 Compare February 26, 2026 17:49

zerox80 force-pushed the feature/clean-thumbnails-avatars branch from 68322d8 to 4bedd0c Compare February 26, 2026 17:56

Refactor upload function in TusUploadHelper to resolve Detekt LongMethod

c67246e

zerox80 force-pushed the feature/clean-thumbnails-avatars branch from 1e3c41f to c67246e Compare February 26, 2026 19:45

zerox80 mentioned this pull request Feb 27, 2026

No Etag after Last Chunk opencloud-eu/opencloud#2409

Open

Conversation

zerox80 commented Jan 19, 2026

Thumbnail Cache Refactoring and Avatar Fixes

Summary

Technical Details

Thumbnail Caching

Avatar Loading

Other Changes

Impact

Testing

Uh oh!

guruz Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

guruz commented Feb 10, 2026

Uh oh!

guruz commented Feb 24, 2026

Uh oh!

zerox80 commented Feb 25, 2026

Uh oh!

zerox80 commented Feb 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zerox80 commented Feb 25, 2026

Uh oh!

guruz commented Feb 26, 2026

Uh oh!

guruz commented Feb 26, 2026

Uh oh!

guruz commented Feb 26, 2026

Uh oh!

zerox80 commented Feb 26, 2026

Uh oh!

zerox80 commented Feb 26, 2026

Uh oh!

guruz commented Feb 26, 2026

Uh oh!

zerox80 commented Feb 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

zerox80 commented Feb 25, 2026 •

edited

Loading